Allow --diff to be used with --jobs#2302
Merged
staticdev merged 3 commits intoPyCQA:mainfrom Jan 21, 2025
Merged
Conversation
Fix the bug reported in PyCQA#2216 where `--diff` is ignored when `--jobs` is non-zero. All credit for this fix goes to @ian-h-chamberlain, who reported the bug and found where the fix needed to be applied.
DanielNoord
approved these changes
Jan 14, 2025
Member
DanielNoord
left a comment
DanielNoord
left a comment
There was a problem hiding this comment.
LGTM!
Up to @staticdev whether a test for this is needed, but it seems like a nice fix to get in.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2302 +/- ##
=======================================
Coverage 99.12% 99.12%
=======================================
Files 40 40
Lines 3098 3098
Branches 788 788
=======================================
Hits 3071 3071
Misses 15 15
Partials 12 12 |
staticdev
added
enhancement
staticdev
approved these changes
Jan 21, 2025
Collaborator
|
Thanks @mnakama and @DanielNoord |
736-c41-2c1-e464fc974
added a commit
to Swiss-Armed-Forces/Loom
that referenced
this pull request
Feb 20, 2026
This MR contains the following updates: | Package | Type | Update | Change | OpenSSF | |---|---|---|---|---| | [isort](https://github.com/PyCQA/isort) ([changelog](https://github.com/PyCQA/isort/releases)) | dev | major | `^5.13.2` → `^7.0.0` | [](https://securityscorecards.dev/viewer/?uri=github.com/PyCQA/isort) | --- ### Release Notes <details> <summary>PyCQA/isort (isort)</summary> ### [`v7.0.0`](https://github.com/PyCQA/isort/releases/tag/7.0.0) [Compare Source](PyCQA/isort@6.1.0...7.0.0) #### Changes #### 💥 Breaking Changes - Drop support for Python 3.9 ([#​2430](PyCQA/isort#2430)) [@​DanielNoord](https://github.com/DanielNoord) #### 🚀 Features - Show absolute paths in skipped file messages ([#​2416](PyCQA/isort#2416)) [@​pranlawate](https://github.com/pranlawate) #### 🪲 Fixes - Some fixes for Python 3.14 ([#​2433](PyCQA/isort#2433)) [@​DanielNoord](https://github.com/DanielNoord) - Test on `3.14` and fix any bugs ([#​2425](PyCQA/isort#2425)) [@​DanielNoord](https://github.com/DanielNoord) - Update CHANGELOG.md + Fix Formatting and Grammar ([#​2419](PyCQA/isort#2419)) [@​lukbrew25](https://github.com/lukbrew25) - Fix output of hanging indent for long lines with noqa ([#​2407](PyCQA/isort#2407)) [@​matan1008](https://github.com/matan1008) #### :construction\_worker: Continuous Integration - Format with `ruff` instead of `black` ([#​2432](PyCQA/isort#2432)) [@​DanielNoord](https://github.com/DanielNoord) - Target 3.10 for `ruff` ([#​2431](PyCQA/isort#2431)) [@​DanielNoord](https://github.com/DanielNoord) - Update development dependencies to latest version ([#​2426](PyCQA/isort#2426)) [@​DanielNoord](https://github.com/DanielNoord) - docs: update pre-commit examples to version 6.1.0 ([#​2413](PyCQA/isort#2413)) [@​pranlawate](https://github.com/pranlawate) - Small cleanup for developer environment ([#​2418](PyCQA/isort#2418)) [@​DanielNoord](https://github.com/DanielNoord) #### 📦 Dependencies - Bump actions/setup-python from 5 to 6 in the github-actions group ([#​2411](PyCQA/isort#2411)) @​[dependabot\[bot\]](https://github.com/apps/dependabot) ### [`v6.1.0`](https://github.com/PyCQA/isort/blob/HEAD/CHANGELOG.md#610-October-1-2025) [Compare Source](PyCQA/isort@6.0.1...6.1.0) - Add python 3.14 classifier and badge ([#​2409](PyCQA/isort#2409)) [@​staticdev](https://github.com/staticdev) - Drop use of non-standard pkg\_resources API ([#​2405](PyCQA/isort#2405)) [@​dvarrazzo](https://github.com/dvarrazzo) ### [`v6.0.1`](https://github.com/PyCQA/isort/blob/HEAD/CHANGELOG.md#601-Febuary-26-2025) [Compare Source](PyCQA/isort@6.0.0...6.0.1) - Add OSError handling in find\_imports\_in\_file ([#​2331](PyCQA/isort#2331)) [@​kobarity](https://github.com/kobarity) ### [`v6.0.0`](https://github.com/PyCQA/isort/blob/HEAD/CHANGELOG.md#600-January-27-2025) [Compare Source](PyCQA/isort@5.13.2...6.0.0) - Remove support for Python 3.8 ([#​2327](PyCQA/isort#2327)) [@​DanielNoord](https://github.com/DanielNoord) - Python 3.13 support ([#​2306](PyCQA/isort#2306)) [@​mayty](https://github.com/mayty) - Speed up exists\_case\_sensitive calls ([#​2264](PyCQA/isort#2264)) [@​correctmost](https://github.com/correctmost) - Ensure that split\_on\_trailing\_comma works with as imports ([#​2340](PyCQA/isort#2340)) [@​DanielNoord](https://github.com/DanielNoord) - Black profile: enable magic comma ([#​2236](PyCQA/isort#2236)) [@​MrMino](https://github.com/MrMino) - Update line\_length and single\_line\_exclusions in google profile ([#​2149](PyCQA/isort#2149)) [@​jagapiou](https://github.com/jagapiou) - Allow --diff to be used with --jobs ([#​2302](PyCQA/isort#2302)) [@​mnakama](https://github.com/mnakama) - Fix wemake profile to have correct character limit ([#​2241](PyCQA/isort#2241)) [@​sobolevn](https://github.com/sobolevn) - Fix sort\_reexports code mangling ([#​2283](PyCQA/isort#2283)) [@​Helveg](https://github.com/Helveg) - Fix correct group by package tokenization ([#​2136](PyCQA/isort#2136)) [@​glasnt](https://github.com/glasnt) </details> --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yLjQiLCJ1cGRhdGVkSW5WZXIiOiI0My4yNS43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZSJdfQ==--> See merge request swiss-armed-forces/cyber-command/cea/loom!284 Co-authored-by: Loom MR Pipeline Trigger <group_103951964_bot_9504bb8dead6d4e406ad817a607f24be@noreply.gitlab.com> Co-authored-by: shrewd-laidback palace <shrewd-laidback-palace-736-c41-2c1-e464fc974@swiss-armed-forces-open-source.ch>
736-c41-2c1-e464fc974
added a commit
to Swiss-Armed-Forces/Loom
that referenced
this pull request
Feb 20, 2026
chore(deps): update isort (major) This MR contains the following updates: | Package | Type | Update | Change | OpenSSF | |---|---|---|---|---| | [isort](https://github.com/PyCQA/isort) ([changelog](https://github.com/PyCQA/isort/releases)) | dev | major | `^5.13.2` → `^7.0.0` | [](https://securityscorecards.dev/viewer/?uri=github.com/PyCQA/isort) | --- ### Release Notes <details> <summary>PyCQA/isort (isort)</summary> ### [`v7.0.0`](https://github.com/PyCQA/isort/releases/tag/7.0.0) [Compare Source](PyCQA/isort@6.1.0...7.0.0) #### Changes #### 💥 Breaking Changes - Drop support for Python 3.9 ([#​2430](PyCQA/isort#2430)) [@​DanielNoord](https://github.com/DanielNoord) #### 🚀 Features - Show absolute paths in skipped file messages ([#​2416](PyCQA/isort#2416)) [@​pranlawate](https://github.com/pranlawate) #### 🪲 Fixes - Some fixes for Python 3.14 ([#​2433](PyCQA/isort#2433)) [@​DanielNoord](https://github.com/DanielNoord) - Test on `3.14` and fix any bugs ([#​2425](PyCQA/isort#2425)) [@​DanielNoord](https://github.com/DanielNoord) - Update CHANGELOG.md + Fix Formatting and Grammar ([#​2419](PyCQA/isort#2419)) [@​lukbrew25](https://github.com/lukbrew25) - Fix output of hanging indent for long lines with noqa ([#​2407](PyCQA/isort#2407)) [@​matan1008](https://github.com/matan1008) #### :construction\_worker: Continuous Integration - Format with `ruff` instead of `black` ([#​2432](PyCQA/isort#2432)) [@​DanielNoord](https://github.com/DanielNoord) - Target 3.10 for `ruff` ([#​2431](PyCQA/isort#2431)) [@​DanielNoord](https://github.com/DanielNoord) - Update development dependencies to latest version ([#​2426](PyCQA/isort#2426)) [@​DanielNoord](https://github.com/DanielNoord) - docs: update pre-commit examples to version 6.1.0 ([#​2413](PyCQA/isort#2413)) [@​pranlawate](https://github.com/pranlawate) - Small cleanup for developer environment ([#​2418](PyCQA/isort#2418)) [@​DanielNoord](https://github.com/DanielNoord) #### 📦 Dependencies - Bump actions/setup-python from 5 to 6 in the github-actions group ([#​2411](PyCQA/isort#2411)) @​[dependabot\[bot\]](https://github.com/apps/dependabot) ### [`v6.1.0`](https://github.com/PyCQA/isort/blob/HEAD/CHANGELOG.md#610-October-1-2025) [Compare Source](PyCQA/isort@6.0.1...6.1.0) - Add python 3.14 classifier and badge ([#​2409](PyCQA/isort#2409)) [@​staticdev](https://github.com/staticdev) - Drop use of non-standard pkg\_resources API ([#​2405](PyCQA/isort#2405)) [@​dvarrazzo](https://github.com/dvarrazzo) ### [`v6.0.1`](https://github.com/PyCQA/isort/blob/HEAD/CHANGELOG.md#601-Febuary-26-2025) [Compare Source](PyCQA/isort@6.0.0...6.0.1) - Add OSError handling in find\_imports\_in\_file ([#​2331](PyCQA/isort#2331)) [@​kobarity](https://github.com/kobarity) ### [`v6.0.0`](https://github.com/PyCQA/isort/blob/HEAD/CHANGELOG.md#600-January-27-2025) [Compare Source](PyCQA/isort@5.13.2...6.0.0) - Remove support for Python 3.8 ([#​2327](PyCQA/isort#2327)) [@​DanielNoord](https://github.com/DanielNoord) - Python 3.13 support ([#​2306](PyCQA/isort#2306)) [@​mayty](https://github.com/mayty) - Speed up exists\_case\_sensitive calls ([#​2264](PyCQA/isort#2264)) [@​correctmost](https://github.com/correctmost) - Ensure that split\_on\_trailing\_comma works with as imports ([#​2340](PyCQA/isort#2340)) [@​DanielNoord](https://github.com/DanielNoord) - Black profile: enable magic comma ([#​2236](PyCQA/isort#2236)) [@​MrMino](https://github.com/MrMino) - Update line\_length and single\_line\_exclusions in google profile ([#​2149](PyCQA/isort#2149)) [@​jagapiou](https://github.com/jagapiou) - Allow --diff to be used with --jobs ([#​2302](PyCQA/isort#2302)) [@​mnakama](https://github.com/mnakama) - Fix wemake profile to have correct character limit ([#​2241](PyCQA/isort#2241)) [@​sobolevn](https://github.com/sobolevn) - Fix sort\_reexports code mangling ([#​2283](PyCQA/isort#2283)) [@​Helveg](https://github.com/Helveg) - Fix correct group by package tokenization ([#​2136](PyCQA/isort#2136)) [@​glasnt](https://github.com/glasnt) </details> --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yLjQiLCJ1cGRhdGVkSW5WZXIiOiI0My4yNS43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiLCJyZW5vdmF0ZSJdfQ==--> See merge request swiss-armed-forces/cyber-command/cea/loom!284 Co-authored-by: Loom MR Pipeline Trigger <group_103951964_bot_9504bb8dead6d4e406ad817a607f24be@noreply.gitlab.com> Co-authored-by: open-source Pipeline <group_90701827_bot_ed04ae348bc5f40af9966fb8b6867e99@noreply.gitlab.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix the bug reported in #2216 where
--diffis ignored when--jobsis non-zero.All credit for this fix goes to @ian-h-chamberlain, who reported the bug and found where the fix needed to be applied.